From: Glenn Morris <rgm@gnu.org>
Date: Sat, 23 Oct 2010 20:43:59 +0000 (-0700)
Subject: Make all copies of xw-defined-colors have identical docs.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~5987
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c18aa943348c9c99b7399e657e2077c18c24cfe5;p=emacs.git

Make all copies of xw-defined-colors have identical docs.
* lisp/term/ns-win.el (xw-defined-colors):
* lisp/term/x-win.el (xw-defined-colors): Make docs identical to w32-win.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a3baa4c5d74..51fff1c59b3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-10-23  Glenn Morris  <rgm@gnu.org>
 
+	* term/ns-win.el (xw-defined-colors):
+	* term/x-win.el (xw-defined-colors): Make docs identical to w32-win.
+
 	* term/pc-win.el (x-select-enable-clipboard):
 	* term/x-win.el (x-select-enable-clipboard):
 	* w32-vars.el (x-select-enable-clipboard): Make doc-strings identical.
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index 4cc26326659..0eb7322c618 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -1138,7 +1138,7 @@ For Nextstep, this is a list of non-PANTONE colors returned by
 the operating system.")
 
 (defun xw-defined-colors (&optional frame)
-  "Internal function called by `defined-colors'."
+  "Internal function called by `defined-colors', which see."
   (or frame (setq frame (selected-frame)))
   (let ((all-colors x-colors)
 	(this-color nil)
@@ -1263,5 +1263,4 @@ the operating system.")
 
 (provide 'ns-win)
 
-;; arch-tag: eb138a45-4e2e-4d68-b1c9-a39665731644
 ;;; ns-win.el ends here
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 5f5336ab2bf..f79942ed33d 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -255,7 +255,7 @@ exists."
 (defvar x-colors)
 
 (defun xw-defined-colors (&optional frame)
-  "Internal function called by `defined-colors'."
+  "Internal function called by `defined-colors', which see."
   (or frame (setq frame (selected-frame)))
   (let ((all-colors x-colors)
 	(this-color nil)